code coverage
Merge branch 'master' into probabilities
merge of heapq code from master into probabilities
grammar rule access via properties
tidier coverage arrangement