Fix shortcutting not working with no arguments