Mostly white-space lint fixes