Eliminate Singleton variable warnings during compilation.
Authored by: dwarren 2019-02-26
Parent: [r9563]
Child: [r9565]
