[WIP] Taker refactor (gratuitous rename, cleanups, devirtualize)