Revert "Numbers in segments in expression are raw numbers not strings"

This reverts commit a1542bc7363267835540c68e6349b3a347ce7e94.
Revert "Changed test to reflect raw numbers in segments"

This reverts commit d1d522a3495aa3d4f18c9f3ab08654515e6f984d.
Convert to using modified esprima to parse template expressions