More work on functions call, and prout removal.