Merge "Refactor menu internals."