Implement suggestions from https://gitlab.labs.nic.cz/knot/knot-resolver/merge_requests/694#note_94482