Normalize implementation name <i>x</i> to <var>x</var>. Add phrase element to those references missing it. Do likewise for 'y'.