shortcuts-grabber: Various cleanup
Follow-up to !104 (comment 79300). Hopefully this will make the code a little more readable and easy to maintain. This is not supposed to introduce any functional changes.
Follow-up to !104 (comment 79300). Hopefully this will make the code a little more readable and easy to maintain. This is not supposed to introduce any functional changes.