Tweak guid handling.
Merge pull request #554 from jcushman/dev.guid

Tweak guid handling.