While we're here could you change these keyword arguments to get rid of the extra white space around the =?  For example `delimiter=delimiter` instead of `delimiter = delimiter`.  PEP8 and all that.  (I realize it was already like that but while we're changing this code then might as well fix this too ;)