Get rid of two more type casts (missed these).