XXX[1]: should that be the case? Simplify the code anyway via selective path search. XXX[2]: Split arch portions to arch specific files, this is a mess