Cleaning up some tech debt in the Eloquent builder and relationship management.