Moved recent v5.0.0 statement fix to current master.