Make content frame stripping more robust.