More fixes to webmessaging origin comparison.