Fix #958, amberc -l. Fix #888, older issue of amberc.