Remove last yoda conditions as per coding standards guidelines.
Merge pull request #1618 from dereuromark/master-cs

Remove last yoda conditions as per coding standards guidelines.