Use more modern xparse style commandsdeclarations