Try to please compiler

[rbdannenberg]

I just made some related changes that created conflicts, so I have merged the relevant changes manually. Thanks.