#311192: Significant refactoring of the menu system; arguments at various non-override paths should now be operational, along with some other intelligent additions to the system.