Re-synchronized project with processout-libjava. Fixed a few convention strays.