Some code simplifications.

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