Migrate spec syntax

Fixes #600.