Cope with null categories
Fix indentation: no functional changes