Processed the comments of @bvhme that ended up in limbo during move from GitHub to GitLab. Thanks @bvhme!