Higher-Order Beta Matching with Solutions in Long Beta-Eta Normal Form