Minor tweak to remove extra window property checks once a client window has been found.