ref: Tidy up types and remove string coercion (#1536)

ref: Tidy up types and remove string coercion (#1536) #162