Bugfix: Fix shifting more args than we pass in