Adding SameAsSubjectExpander configurability and makeAssociationsInstead option.