Clean up some imports, clarify one place that throws so there's a bit more info.