Revert "Minor cleanup and (potential) optimization in compiler"

This change introduced a bug but didn't cause unit tests to fail due to
automatic fallback to interpreter if compilation doesn't work.

This reverts commit 59e0cbabf465563c111350de9896e7019a81f01b.