Made addVariable(...) and addFunction(...) public.