I think it would also be nice to move this toggle command to the sandbox so there's no traces of trimming whitespace left in "core".