These were all tested against images I created or obtained, using a script to test random combinations of valid and invalid mount and remount options, and comparing the results before and after the changes. AFAICT, all parsing works as expected and behavior is unchanged. (Changes since first send: fixing a couple string leaks, added hfs and hfsplus.) Thanks, -Eric