More refactorings to generalize behavior to platform-specific jars