Stop forcing str on something that isn't always a str [MJ-888]

Not sure if this is how I should do it, but it works.

All tests pass.