In 2 places, removed local var def before return of var, replaced with actual expression. This follows the other methods' code pattern.