TRQ-3021. Fix two compilation errors for alternate configurations.

I didn't check these before checking in my refactoring yesterday.