Finish conversion to new, templated religion
Now complete conversion for real, previous commit was a decoy