Proper handling of options and fstype, "automount -L" declutter,
some code refactoring.