Various cleanups and fixes to Makefiles, due to separation of premain.s