Fix static linking bug due to missing JIT references.
Cleanup.
Whitespace cleanup