Allow underlaydir to be overridden without messing up inclusion of other underlays...