Tighten up handling of checks for shift instructions