More tweaks for building both the threaded and normal runtimes.