Misc. library modernization

filesystem-trees depends on data-lens, which is pretty old. Also some ifdefs