Unify annotated and plain versions of app-template