Fixes checkstyle violation.
Adds generic argument tracking.