Reduce some quirks when 'wrap' is set

Ref #539