With this patch, the platform differences reside solely in the implementation of the base library. Issue #1832