Added patch that removes faulty expat check. Minor cleanups. Signed-off-by: Rosen Penev <rosenp@gmail.com>