Move detokenize to solution level