Minor modifications needed to get wrap-region working.