Post-merge follow up on fixes suggested in #5319
Created by: mrnugget
This implements the two suggestions made by @felixfbecker in #5319.
Thanks for those!
Created by: mrnugget
This implements the two suggestions made by @felixfbecker in #5319.
Thanks for those!