Eww, this was a bit wrong. Fix some wrappings.