I have already resolved one problem with template expansion, but I've run into another.

After resolving those problems, have you done a make clean and rerun Configure? If you haven't try it now.