Remnant of table-driven approach removed (confused Opera)