Checkpoint before refactoring to openstruct across the board.
Checkpoint before refactoring to openstruct across the board.

awestruct/awestruct,awestruct/awestruct,LightGuard/awestruct,awestruct/awestruct,LightGuard/awestruct,LightGuard/awestruct