Make more consistent with upstream.
Remove duplicate whitespace strip function.