Small simplifications.