Fix the runtimepath up a bit more.
Incremental commit.