Some more grouping of related macros and update macro menus.