Improvements to mavenization. Working around a series of threading bugs. Ugh.