small simplifications to enrichedmetricspace