Minor wrap position detection improvements and clarifications.