Should fix latches if any were inferred.