Further refinements to the Arel implementation