more cleanup of old-template parse/conversion