Is there a reason to go the shim route rather than simply fixing the templates to behave in a future-proof way?