Refactor assoc-transforms