Converting to top self probably isn't a good fallback. I'll take a look at this again after I've merged this.