Remove redundant brackets, eta reduce some functions.