[etc] use qualifier where appropriate