Additional makefile cleanup for separators
A few more possible separator fixes.