Updated how non-delimited things are handled