Working on replacing crufty old type converters with AlgebraicConverter.
Additional code clean up.