Merge in latest refactorings from BigSemanticsJava.