Refactoring: ColumnReferenceType -> QueryBlockPlacement; WhereGroupHaving are now separate categories