Handle wrapped

More low-hanging fruit. Closes #715 and #716.