don't need 'return'
tweak the code that adds SetLineNo()
group load_const() and a new collect_constants()