Please convert these to Trimpath templates. I understand that you prefer these over Trimpath templates, and OAE is planning to switch at some point as well, but for now I'd like to keep some consistency.