Use packageLink() more consistently, and shorten some markup