Substitute may need to explicitly handle number, boolean, and null

[Johnbastian]

First write some tests to check this, as unsure if number and boolean are consistently being converted to string or not. Else, issue lies elsewhere.