TODO: Remove a couple of since-completed items.