I should have diff'ed the header with the Alpha GENERIC. + fix style nit + turn on NO_MODULES for now.