Post-merge from source.
Mainly reverting 1.7 Java nuisances.