Remove m2e warnings, also fix whitespace.