I think you could just call failArgumentCheck with the right arguments when there's no messageFormat provided instead of modifying failArgumentCheck itself. Same throughout.