fixup! Cleaning up type aliases