Refactored current_xxx_number to xxx_num
Separated source map into two
Oops.
Noted the transitory nature of a line of compatability code.
Merged branch