FIX: Remove redundant conditional in 'groupby' and 'having' methods