lib: replace consistent* versions of marquise functions with raw ones, this is probably what was making borel so slow