I think he should do that in another PR--purpose of this one is to add `use "strict"` and add curlies to the `if`s. We'll be checking for too many things if he adds that in, but I do agree that a sub-template would make it cleaner.