Synchronise o_str.c between 0.9.8-dev and 0.9.7-stable.