Move tokyotyrant formulae into their proper position