Refactoring; replacing some invokes with direct expression invocation