I missed compile warnings for these. Sorry for the noise. Also combine assignments with null checks to save a few lines.