Make define_non_cyclic_method simpler
Fix some indentation on autosave association
Merge pull request #12569 from arthurnn/autosave_small_cleanip

Small cleanup on autosave association