@jnothman @arjoly do you agree with this suggested change? If so I can do it an then merge this PR.