List handler tweaks.