Changes after spending time trying to fix errors related to Arel last_column issues.