Better universal support for blank parameter tokens