Cleanup syntax and make specs pass.