menu: code cleanup, naming changes, simplify refcounting, make internal func take...