simplified some calls
minor #972 simplified some calls (fabpot)

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

simplified some calls

Commits
-------

21d6ff4 simplified some calls