r18482: Fix a couple of small issues in the generated server code.