In preconditions, use symbols instead of strings.

For consistency, changed remaining uses of "pre 'word1-word2' to
"pre :word1_word2".  IMO, the new syntax is a little cleaner.