opcodes: Remove dependency on query module