A bit more JSON compatibility in Dynamic.
Include cleanup.