More tweaks to chaining.