Comet transport fix.

NPE were fixed for improve snippet rendering time.
Ditto -- what's the need to change this?
TBH I'm trying to move more away from symbolic names. People find them harder to learn.