Simplify .wrapAll() and fix style. Close gh-1116.