Cleanup of 8a60b78: Fixes for running code compiled by ESC