Use null fallbacks on empty lists
Minor bug fixes
Remove extraneous code