re-ordered server opcodes and handlers to make merging more manageable.