More use of maybe-require-package