All parsing routines have the same signature now.  #94