[...] One note, I don't like macros that span multiple
Having a macro for each scriptlet (or forgoing a macro if the resulting code
is simple enough) seems to be about the right level of indirection.
It does not look pretty I agree, but my motivation is to make things
simple for plugin packagers. Also, it makes it simple to update the
macro when bugs show up without having to update the packages with
additional macros. They just get the update when they are rebuilt.