Temporarily revert empty line indentation stripping to ease merges

This changeset covers OnDemandList and tree, which were apparently
not included in the blanket indentation-stripping commit.