Allow operators as wrap points when they follow another operator

Fixes #374
Merge pull request #442 from bitwiseman/operator-wrap

Allow operators as wrap points when they follow another operator