Clean up some bits after confirming that system search path works cross-platform