Idiomatic nonterminal construction

Fixes #88.
Fixes #24.