Improved shorthand handling