Index: contrib/arch/uspace/lib/libfs/fnc.libfs_mount
===================================================================
--- contrib/arch/uspace/lib/libfs/fnc.libfs_mount	(revision 6d4c5497f87538bcbe4b9753ccd5efe134ee9ec4)
+++ contrib/arch/uspace/lib/libfs/fnc.libfs_mount	(revision 0a1a313fc7edf7be3a41a16a90b8a500d6c98651)
@@ -4,6 +4,7 @@
 		alternative (fs; tmpfs; fat; devfs) {
 			!fs.ipc_m_connect_to_me ;
-			!fs.mounted ;
-			!fs.ipc_m_data_write /* forward */
+			!fs.mounted {
+				!fs.ipc_m_data_write /* forward */
+			}
 		}
 	}
Index: contrib/arch/uspace/srv/vfs/vfs.bp
===================================================================
--- contrib/arch/uspace/srv/vfs/vfs.bp	(revision 6d4c5497f87538bcbe4b9753ccd5efe134ee9ec4)
+++ contrib/arch/uspace/srv/vfs/vfs.bp	(revision 0a1a313fc7edf7be3a41a16a90b8a500d6c98651)
@@ -22,6 +22,7 @@
 							/* root fs */
 							alternative (fs; tmpfs; fat; devfs) {
-								!fs.mounted ;
-								!fs.ipc_m_data_write /* mount options */
+								!fs.mounted {
+									!fs.ipc_m_data_write /* mount options */
+								}
 							}
 						) +
@@ -93,6 +94,7 @@
 				alternative (fs; tmpfs; fat; devfs) {
 					[fnc.vfs_grab_phone] ;
-					!fs.read ;
-					!fs.ipc_m_data_read /* forward payload */ ;
+					!fs.read {
+						!fs.ipc_m_data_read /* forward payload */ ;
+					} ;
 					[fnc.vfs_release_phone]
 				}
@@ -106,6 +108,7 @@
 				alternative (fs; tmpfs; fat; devfs) {
 					[fnc.vfs_grab_phone] ;
-					!fs.write ;
-					!fs.ipc_m_data_write /* forward payload */ ;
+					!fs.write {
+						!fs.ipc_m_data_write /* forward payload */ ;
+					} ;
 					[fnc.vfs_release_phone]
 				}
@@ -129,6 +132,7 @@
 				alternative (fs; tmpfs; fat; devfs) {
 					[fnc.vfs_grab_phone] ;
-					!fs.stat ;
-					!fs.ipc_m_data_read /* forward struct stat */ ;
+					!fs.stat {
+						!fs.ipc_m_data_read /* forward struct stat */ ;
+					} ;
 					[fnc.vfs_release_phone]
 				}
@@ -144,6 +148,7 @@
 					[fnc.vfs_lookup_internal] ;
 					tentative {
-						!fs.stat ;
-						!fs.ipc_m_data_read /* forward struct stat */
+						!fs.stat {
+							!fs.ipc_m_data_read /* forward struct stat */
+						}
 					}
 				}