Support objects/arrays/resources a bit better, refs #410