Annotate and clean up empty specs