Partial fix for issue #18 - now only calling shift helper for immediate mode, using one and two argument handlers for all others