Fix some regressions in rm-builder from last commit.