Merge pull request #268 from csmith/master

Add utility method for holding parser readlock.
Remove hasChannel.

Pointless now getChannel is optional.
Remove ChannelMap.contains too.