Make sure that output directory variables aren't overriden by $OUTPUT. [Closes: issue885]