Fixed up more groovy warnings, and updated QueryBuilder so it wouldn't cause build warnings - yay!