Changed functions call to pass Status object rather than FunctionContainer.
Small tidy up.