Remove trailing spaces and leading tabs that crept in.
The lack of support for named constants is not a regression relative to the toolbox implementation.