Got rid of unnecessary dummy vars; some phpDoc fixes and additions to make inspections happy;fix params to call_user_func to use array