Switched to Applicative style where possible, in some cases.