Getting rid of argument checking as contributors note suggests