Preparing the addition of new primitives.
Cleanup of error messages.