further cleanups on top of last cleanup
further cleanups on top of last cleanup

philipl/libmtp,philipl/libmtp,libmtp/libmtp,jemc/libmtp,libmtp/libmtp,libmtp/libmtp,jemc/libmtp,reverendhomer/libmtp,reverendhomer/libmtp,philipl/libmtp,reverendhomer/libmtp,jemc/libmtp,jemc/libmtp,reverendhomer/libmtp