Pass the manager itself to Metric.manage so that a reference to the original manager is kept and more suitable errors can be reported. Add a .managed property for convenience and backwards compatibility. Remove a number of unnecessary calls to .manage in tests.