Minor style edits, removing an useless test.