Reorganizes question templates to use more template fragments to reduce redundancy.