Recovering from previous bizarre IDE failure resulting in truncated file.
Also, several optimisations may now be functional.