Rearrange how ambiguous ops are handled, closes #1378