Yes, would agree. Just kept it consistent with the other use for now. Possibly TOOLSDIR should be even set in the toplevel dir. Left for some other clean-up PR.