Add trailing whitespace removal and signaling