Clean up Container#normalize()