Improve cross-platform OS package support
Clean up notation