Minor changes - some assertions simplified.