Simplify. No change in functionality. (Reviewing r1653857) Merged r1653972, r1654148 from tomcat/trunk.