Rename and space-to-tab conversion.
Some functional simplification and additional test coverage.

The metaclass is now fully tested.