Less specific trailing param check

Change-Id: I0ccf21aaf81fd385c4dd636122e800a61af7bc14