Merge pull request #99 from jwillemsen/jwi-bcc64-delayedtemplateparsing