More yoda conditions and more constant wrapping for constants