Clean up some redundant else statements, clean up remaining pedantic warnings.