Small cleanup to #![]'s