Refactor to make vars and receivers consistent with types used.