More progress on opcodetable refactor