Changes that should get into upstream.