Minor improvements

Not sure if you prefer the space for anonymous functions or not. Let me know if not so that I can remove that patch.