Syntax cleanup

I like Applicative syntax better.