A cool change Riot could make would be to turn the Shorty into a primary weapon instead of a pistol. That way you couldn't carry one around with an OP, but if you bought one on a pistol/save round and an enemy was too far away you could at least switch to the classic.