Fixed some return-value problems revealed by the itemize test (which