Bug fix with black wrap mode -- wasn't actually returning right address
With wrap bug fix in place, simplify over