Reinstate class annotations for special rules