More Java 7 specific fixes based on IDE suggestions and cleanup