Always use affinity :right in #adjust_for_insertions
Updated debug info
Accept single token_name symbol in addition to array thereof