New handling for Rails association names, much better