Moved correctness comments to templates