Remove obscure usage check and replace with a more sane parameter count check