Add argument checks back.