Restore some mixed typed arguments with ?string type

Summary: fixes #3832

Reviewed By: @ptarjan

Differential Revision: D1592864