* Issue #503: Quote the changed files.
* Refactor heap alloc substitution.