Updates samples to 1654 Build
Inadvertantly broke static class support when counting constructors.