Added more debug info w.r.t. opcodes. Cleaned up handling of opcodes a
bit.