Fix conflicts between &modifiable and :edit

A temporary fix for issue #323.