Minor improvements + Parse helper.