x:nil support, other fixes per guang
Merge pull request #1982 from jeffwilcox/dev-nil

Monday afternoon updates; x:nil