Notable specs and identifier cleanup.