Re-add automatic trailing whitespace removal