Reinstate some more [[ ]], removed in r22947 but needed by loglines of recent changes