Slightly uglier filenames, but less code and free diffing! Approved in ADR-466 for Khan use. Fixes #23.