Transitioned everything over.  A few things aside (like s.toString()), it's all back.