Wipe out @state indirection in UGLIServer
Visual tweaks to add space when possible