Consistency improvements with the Rails 3 branch.