Slight changes for easy of understanding/debugging using unused variables

It looks like during a previous code review/merge some bits of code was changed to inline method calls instead of dumping them to a variable then using that variable.  The result was calling was multiple calls to the same lookup method with one of the results never being used.  I'm reverting to the easier to read variant as its far easier to debug when there is a variable/new line than with inlined calls.  The compiler will optimize the variables away if possible anyway.