Avoid duplicate method calls

In support of #231, here's a little fix to take
a couple of things off that warning count!
Merge pull request #256 from andyw8/avoid_duplicate_method_calls

Avoid duplicate method calls