Mask: address two unit test failures

[zjs]

This pull request includes commits which address:

• a unit test failure in Chrome due to a test bug (use of "focus(element)" instead of "element.focus()")
• a unit test failure due to an order-of-operations-related coding error

[jzaefferer]

Thanks, landed.