+ Some code cleanup Ref #773
This raised the opportunity to structure the library more cleanly for each supported platform.