Unified and cleaned up variables evaluations (direct, indirect, if
present). Plus some minor clean ups.