Convert number to new format
Remove all old structs and simplify As-methods