Fix brokeness by recent changes.