More work on shortcut functions.