Forced password change should not prevent masquerade same user from using the site

The check masquerade module does is against $_SESSION['masquerading'])) . Is it too simplistic to add that check like:

/**
 * Checks whether or not user has a pending password change
 */
function force_password_change_check()
{
	global $user;

  if (isset($_SESSION['masquerading'])) {
    return FALSE;
  }
  ...

In this way, at least my use case as described works (masquerading user can use the site as if there were no pending password change forced), and when not masquerading but actually logging in as that user, I am still prompted and forced to change password.

Thoughts?

Here is a patch against 7.x-2.2 equivalent to #2 above.