If the WKB reader code will be touched perhaps issue #36 could be considered at the same?