Whitespace tweaks, move non-null checkery.