Replace transition variables with mixins