Static var + method pairs -> just methods in PackageServiceProps; other small changes