Addressing jmclaus, and polesye comments.