Updated mixins to handle all types of arrows.