reduces nesting in interpreter sources

/cc @dedoz