Update assertions to be more clear (and correct)

* Assertions as previously written were not allowing combinations of DbHashKey and DBRangeKey to create expressions