Remove typeof whenever possible