Also, the less formatting churn you can make in these classes, the less they will diverge from square/dagger, so nothing unnecessary.  If it's necessary, then by all means.