Update expressive binding; include elvis operator [ci skip]