Implementation and spec cleanup for #713