Removed the use of Either to keep up with upstream.