Remove silly use of os.join
Extract merge_empty behaviour to ZA subclass

as per @dracos's suggestions -- this obsoletes the flag, and makes
it a behaviour of ZA subclass.