Add check for no-argument calls