I added this to issue #196 so that all possible future changes are in the same place.