nvda

90ceb810 - move static class definitions inline