Incorporate Mikeleib's comments for sig handler.