Note to self: this is incorrect and needs to be zapped. Remove unused vfaces from function arguments while at it.