Add some infrastructure for shortcuts and macros