Small chaining tweaks while constructing a demo for #38