tweak templating in annotated code writer some more