Changes to make static analysis happy --- getting rid of ! type assertions