Would you mind moving the static to be in front of the nulls in each of these cases. Also, would you mind sending this on the 4.0 branch? :)