Handling APFS/HFS+

This being a subsidiary question, I reworded and moved it here.