Add BufferOffset comment.
Reinstate Marty's code from b8df29aa2de07705757a8e6de4 with comment.