Oops, reverting some unnecessary casts.