Agreed. dynamic_casts removed on next push in both files.