Polished semantics further [skip ci]
Polished semantics further [skip ci]

stefanse/CS4All,cksystemsteaching/selfie,cksystemsteaching/selfie,ChristianMoesl/selfie,cksystemsteaching/selfie,ChristianMoesl/selfie,stefanse/CS4All