Clean up the conditionals a bit.
Fix up javadoc unzipping.