Fix some style nits in commit eee8a40