Updates based on the feedback from @City-busz via the AUR.