Updates for upstream Iron changes.