Rearranges some code to obviate the need for the *_now variables. Also separates out the common instr-is-meta check to an outer if-condition.
This is in preparation for sending the i#4963 fix for review. Split out this harmless refactor to make review easier for that fix.
Issue: #4963 (closed)