Consistency fixes with the Rails 3 branch.