Support both integers and floats in IncrementType (closes #526)