Got rid of more -Wreturn-type warnings