Add argument predicates.
Update test templates accordingly.
Update TODO.