tirex-plug: refactoring leftovers omnomnom