[DAVAF-1962] - Code Review, excessive dynamic_casts removed.