Add even more override specifiers
Follow-up on 0d9d0b4b5f3da271b6265ab706608c623809a5a9 and 5b736db899d06f9b0b53a815d83f2c8ec9824962.