Correcting the order of some library includes.
NEON-1267 Adding a quick fix to convert our expected primitives to strings before pulling out substrings.