more strict typecasts
7 files changed