Further fixes, simplfy function and 'tell' parser about new function.