Clean up ShortcutUtils a little