Reorganize fstab references.