Standardize cipher hex values and fix collision.

Thanks for putting this together. My pull request contains fixes for a couple of issues (see commits for details).