Removed helper class in get_c_extract, fixed typedef indentation in scalar.