Slightly better OPTFLAGS handling