Clarify intent.
Clean up conversion mixin and update tests.