Fixed with-args to be able to handle identifier.