Working through refactor of opcodetable.cpp