I'm holding off committing this until server code freeze. I am aware of a FE/BE patch that may get proposed, which would change the way functions are called.
Dave