New tweaks

Fix a few style issues from changes in Atom core.