Improved normalization, make_reference, resolve interface.