Remove two unnecessary macro defines

Both just remacro STRFY, so just use that instead.

TOSTR was unused, so it may as well be removed