Allow longer defined terms

Closes #450.