Minor function rewrite to modern code.
Proof that code-specified parameters can be used to override annotations