Fixes #56

I should've done this so much earlier, it was just a missing else if:
the code would add a second copy of the underscore we were trying to
replace, wreaking havoc on the result. Now it's fine.