Remove trailing tabs causing false grep positives
Pass MACHINE and MACHINE_ARCH down into the modules