Added custom arrow variables, and code to support them.