Improve constant assignment to handle numbers better.

Before, a matcher like `has_4_things` would get
assigned a constant like `Has_4Things`.  Now it gets
`Has4Things`.