Fix issue that dependency files become default target when included before "all". Minor cleanups.