Integrate azakai's style feedback and make sanity tests pass again.