More work on the base COM implementation.