Cleanup addJars

Just code style changes, so it doesn't have to go into 0.9.0 and it is fine for 0.9.1.