Addressed PR comments.

Restored some original variable names.

Tightened restriction on when AIF mask is used, only when NOT using
either population aif or prescribed aif.