* numbering functions moved to token.inc file * cleaner code over lazzy loading (see history of bug fix #680444)