Fix repeat def of OS_BSD when sub-BSD flavor detected. Fix some make tests that fail on non-2003 compile modes.