Allow operators as wrap points when they follow another operator

Fixes #374
Fixes #438 (as far as we can fix it).