Fixed -e and -r.

  The command-line flags were broken when used in their
 short-versions.

  This closes #168