Damn, there I was thinking that my solution feels unimprovable, and only 7 hours later I find an improvement!