Cleanup
Fix normalization proxies / bijection instances