Missing %token for tOVER
Tweak to conversion function rules
Rename inner nested functions to avoid collisions