(cleanup) Updated for iron flattening/other breaks.