Replaced some explicit options for target linking with to be consistent with the...