Rewriting part of `this.proxy()` to handle #198 better