Trim down to reflect is-not-free-in going away and similar changes.
Trim down to reflect is-not-free-in going away and similar changes.

raphlinus/ghilbert,raphlinus/ghilbert,raphlinus/ghilbert,raphlinus/ghilbert