Cleaned up CPE negotiation implementation, to decouple packet definitions from extension definitions.