add P1296 and P1422; add "template" field to definition -- with autogeneration of normalize and url functions