some whitespace changes to make it easier to keep in sync with 1.9 Conf_compat17...