Merge "Don't register methods when there's nothing to register."