Feature/conservative performance

cc @bnoordhuis