Fix parsing and optimize add call.