API tag and error message cleanup.
27 files changed