Leaf punctuation change.

Introduce key with hyphen instead of colon, and related syntax
tweaks and simplifications.