Follow up to r1642282
Clean-up. No functional changes.
- Update comments to reflect code changes
- Remove unnecessary nesting of if/else
- Reduce code duplication in decoder matching

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1642354 13f79535-47bb-0310-9956-ffa450edef68