Corpus specs pass.
Minor cleanup of entry point