Fix trailing whitespace ref #2725