Conform to v0.1+ API updates.