meta: rework internals to work around a (maybe) compiler issue

meta: rework internals to work around a (maybe) compiler issue #88