Slight cleanups to the architecture specific makefile templates to make the common configuration sections as identical as possible.