Parser / writer improvements.