More type-level cleaning

Closes #62