Cleaned up the Primitives library.