Allow more complex commands in EDITOR

Fixes #1.