Move towards more unified object structure; update stringify for various primitives (i.e. functions)