Context

Minor, non-controversial changes brought on during development of !2131 (closed) but unrelated to the core of that MR

Manually testing the MR

N/A

Checklist

N/A Document the interface of any function added or modified (see the coding guidelines)
Provide automatic testing (see the testing guide).
N/A Add item in the Development Version section of CHANGES.md (only for new features and bug fixes).

Reviewers

@mbouaziz @rafoo_