Fixes #184: Support for Using Generics

Plus a touch of code cleanup on the Windows side.