Made the assert less restrictive. Reviewed-by: dholmes, dcubed, sspitsyn
Reviewed-by: sla, dholmes
Reviewed-by: sla