Eliminate "?" that makes schema more lax than it should be