CS and docblock fixes

Third of a few pulls to replace #6.
Could you revert this, call_user_func_array is much slowed and should only be done when absolutely needed.