undo some unnecessary changes
Actually support numbers/strings

This requires some care to avoid numbers/strings inside object reps
taking priority over the objects themselves.