Factored Substition/SubstitutionVector out of Effect.h/cpp