Added an Either style deserializer method. Some minor cleanup.