Removed implementation-specific stuff.