Fix main() in Jonah & Sugarcane to support macros in Start passage

Change-Id: I89830ae274f6f40364a4a32b98288f0948007d7d
Signed-off-by: Stormrose <eturnerx@gmail.com>