Incorporate feedback from Tim Bray