Overcommit simpler

Supersedes #393