diff --git a/src/ast/rewriter/array_rewriter.cpp b/src/ast/rewriter/array_rewriter.cpp
index dd0e7e869..08173d430 100644
--- a/src/ast/rewriter/array_rewriter.cpp
+++ b/src/ast/rewriter/array_rewriter.cpp
@@ -228,14 +228,17 @@ br_status array_rewriter::mk_select_core(unsigned num_args, expr * const * args,
                 }
                 return true;
             };
+            expr *array = to_app(args[0])->get_arg(0);
+            bool is_leaf = m_util.is_const(array);
             bool should_expand =
                 m_blast_select_store ||
+                is_leaf ||
                 are_values() ||
-                (m_expand_select_store && to_app(args[0])->get_arg(0)->get_ref_count() == 1);
+                (m_expand_select_store && array->get_ref_count() == 1);
             if (should_expand) {
                 // select(store(a, I, v), J) --> ite(I=J, v, select(a, J))
                 ptr_buffer<expr> new_args;
-                new_args.push_back(to_app(args[0])->get_arg(0));
+                new_args.push_back(array);
                 new_args.append(num_args-1, args+1);
                 expr * sel_a_j = m().mk_app(get_fid(), OP_SELECT, num_args, new_args.data());
                 expr * v       = to_app(args[0])->get_arg(num_args);
diff --git a/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h b/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h
index dc1df22a3..7a3ee0ea6 100644
--- a/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h
+++ b/src/ast/rewriter/bit_blaster/bit_blaster_tpl_def.h
@@ -27,7 +27,7 @@ Revision History:
 
 template<typename Cfg>
 void bit_blaster_tpl<Cfg>::checkpoint() {
-    if (memory::get_allocation_size() > m_max_memory)
+    if (memory::get_allocation_size() > m_max_memory || memory::above_high_watermark())
         throw rewriter_exception(Z3_MAX_MEMORY_MSG);
     if (!m().inc())
         throw rewriter_exception(m().limit().get_cancel_msg());
diff --git a/src/math/lp/mps_reader.h b/src/math/lp/mps_reader.h
index f2cf2d320..8093954b1 100644
--- a/src/math/lp/mps_reader.h
+++ b/src/math/lp/mps_reader.h
@@ -277,8 +277,8 @@ class mps_reader {
         } else {
         fail:
             set_m_ok_to_false();
-            *m_message_stream << "cannot understand this line" << std::endl;
-            *m_message_stream << "line = " << m_line <<  ", line number is " << m_line_number << std::endl;
+            *m_message_stream << "cannot understand this line\n"
+                                 "line = " << m_line <<  ", line number is " << m_line_number << std::endl;
             return;
         }
     }
diff --git a/src/params/bit_blaster_params.h b/src/params/bit_blaster_params.h
index 527835d2a..9e405f187 100644
--- a/src/params/bit_blaster_params.h
+++ b/src/params/bit_blaster_params.h
@@ -33,8 +33,8 @@ struct bit_blaster_params {
 #endif
 
     void display(std::ostream & out) const {
-        out << "m_bb_ext_gates=" << m_bb_ext_gates << std::endl;
-        out << "m_bb_quantifiers=" << m_bb_quantifiers << std::endl;
+        out << "m_bb_ext_gates=" << m_bb_ext_gates << '\n';
+        out << "m_bb_quantifiers=" << m_bb_quantifiers << '\n';
     }
 };
 
diff --git a/src/params/pattern_inference_params.cpp b/src/params/pattern_inference_params.cpp
index bb9b481ca..26f606b63 100644
--- a/src/params/pattern_inference_params.cpp
+++ b/src/params/pattern_inference_params.cpp
@@ -31,7 +31,7 @@ void pattern_inference_params::updt_params(params_ref const & _p) {
     m_pi_warnings                = p.warnings();
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void pattern_inference_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_pi_max_multi_patterns);
diff --git a/src/smt/params/dyn_ack_params.cpp b/src/smt/params/dyn_ack_params.cpp
index b1e99cf21..57645903d 100644
--- a/src/smt/params/dyn_ack_params.cpp
+++ b/src/smt/params/dyn_ack_params.cpp
@@ -29,7 +29,7 @@ void dyn_ack_params::updt_params(params_ref const & _p) {
     m_dack_gc_inv_decay = p.dack_gc_inv_decay();
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void dyn_ack_params::display(std::ostream & out) const {
     DISPLAY_PARAM((unsigned)m_dack);
diff --git a/src/smt/params/preprocessor_params.cpp b/src/smt/params/preprocessor_params.cpp
index 9fcb09843..f3c46f95c 100644
--- a/src/smt/params/preprocessor_params.cpp
+++ b/src/smt/params/preprocessor_params.cpp
@@ -34,7 +34,7 @@ void preprocessor_params::updt_params(params_ref const & p) {
     updt_local_params(p);
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void preprocessor_params::display(std::ostream & out) const {
     pattern_inference_params::display(out);
diff --git a/src/smt/params/qi_params.cpp b/src/smt/params/qi_params.cpp
index 387df4dd5..d6b22d9f1 100644
--- a/src/smt/params/qi_params.cpp
+++ b/src/smt/params/qi_params.cpp
@@ -39,7 +39,7 @@ void qi_params::updt_params(params_ref const & _p) {
     m_qi_quick_checker = static_cast<quick_checker_mode>(p.qi_quick_checker());
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void qi_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_qi_cost);
diff --git a/src/smt/params/smt_params.cpp b/src/smt/params/smt_params.cpp
index 37249fdac..3c63e2fff 100644
--- a/src/smt/params/smt_params.cpp
+++ b/src/smt/params/smt_params.cpp
@@ -85,7 +85,7 @@ void smt_params::updt_params(context_params const & p) {
     m_model          = p.m_model;
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void smt_params::display(std::ostream & out) const {
     preprocessor_params::display(out);
diff --git a/src/smt/params/theory_arith_params.cpp b/src/smt/params/theory_arith_params.cpp
index 565000ebe..7f3f1ca23 100644
--- a/src/smt/params/theory_arith_params.cpp
+++ b/src/smt/params/theory_arith_params.cpp
@@ -42,7 +42,7 @@ void theory_arith_params::updt_params(params_ref const & _p) {
 }
 
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void theory_arith_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_arith_eq2ineq);
diff --git a/src/smt/params/theory_array_params.cpp b/src/smt/params/theory_array_params.cpp
index 892edb4ad..2283be256 100644
--- a/src/smt/params/theory_array_params.cpp
+++ b/src/smt/params/theory_array_params.cpp
@@ -25,7 +25,7 @@ void theory_array_params::updt_params(params_ref const & _p) {
     m_array_extensional = p.array_extensional();
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void theory_array_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_array_mode);
diff --git a/src/smt/params/theory_bv_params.cpp b/src/smt/params/theory_bv_params.cpp
index 35a62e7fc..09fa4513f 100644
--- a/src/smt/params/theory_bv_params.cpp
+++ b/src/smt/params/theory_bv_params.cpp
@@ -31,7 +31,7 @@ void theory_bv_params::updt_params(params_ref const & _p) {
     m_bv_size_reduce = p.bv_size_reduce();
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void theory_bv_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_bv_mode);
diff --git a/src/smt/params/theory_datatype_params.h b/src/smt/params/theory_datatype_params.h
index 05957bfe9..b16f4254a 100644
--- a/src/smt/params/theory_datatype_params.h
+++ b/src/smt/params/theory_datatype_params.h
@@ -32,7 +32,7 @@ struct theory_datatype_params {
         m_dt_lazy_splits = p.dt_lazy_splits(); 
     }
 
-    void display(std::ostream & out) const { out << "m_dt_lazy_splits=" << m_dt_lazy_splits << std::endl; }
+    void display(std::ostream & out) const { out << "m_dt_lazy_splits=" << m_dt_lazy_splits << '\n'; }
 };
 
 
diff --git a/src/smt/params/theory_pb_params.cpp b/src/smt/params/theory_pb_params.cpp
index 45a6ede10..2df8d6fee 100644
--- a/src/smt/params/theory_pb_params.cpp
+++ b/src/smt/params/theory_pb_params.cpp
@@ -25,7 +25,7 @@ void theory_pb_params::updt_params(params_ref const & _p) {
     m_pb_learn_complements = p.pb_learn_complements();
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void theory_pb_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_pb_conflict_frequency);
diff --git a/src/smt/params/theory_str_params.cpp b/src/smt/params/theory_str_params.cpp
index e0802b5d7..7f84a6cbe 100644
--- a/src/smt/params/theory_str_params.cpp
+++ b/src/smt/params/theory_str_params.cpp
@@ -37,7 +37,7 @@ void theory_str_params::updt_params(params_ref const & _p) {
     m_FixedLengthNaiveCounterexamples = p.str_fixed_length_naive_cex();
 }
 
-#define DISPLAY_PARAM(X) out << #X"=" << X << std::endl;
+#define DISPLAY_PARAM(X) out << #X"=" << X << '\n';
 
 void theory_str_params::display(std::ostream & out) const {
     DISPLAY_PARAM(m_StrongArrangements);
diff --git a/src/tactic/core/collect_statistics_tactic.cpp b/src/tactic/core/collect_statistics_tactic.cpp
index b02adad6e..b2c46cae6 100644
--- a/src/tactic/core/collect_statistics_tactic.cpp
+++ b/src/tactic/core/collect_statistics_tactic.cpp
@@ -73,10 +73,10 @@ public:
         for (unsigned i = 0; i < sz; i++)
             for_each_expr(cp, visited, g->form(i));
 
-        std::cout << "(" << std::endl;
+        std::cout << "(\n";
         for (auto const& kv : m_stats) 
-            std::cout << " :" << kv.first << "    " << kv.second << std::endl;
-        std::cout << ")" << std::endl;
+            std::cout << " :" << kv.first << "    " << kv.second << '\n';
+        std::cout << ")\n";
 
         g->inc_depth();
         result.push_back(g.get());
diff --git a/src/tactic/smtlogics/smt_tactic.cpp b/src/tactic/smtlogics/smt_tactic.cpp
index d47650c34..aefe7ccad 100644
--- a/src/tactic/smtlogics/smt_tactic.cpp
+++ b/src/tactic/smtlogics/smt_tactic.cpp
@@ -23,7 +23,7 @@ Author:
 
 tactic * mk_smt_tactic(ast_manager & m, params_ref const & p) {
     sat_params sp(p);
-        if (sp.smt())
+    if (sp.smt())
         return mk_solver2tactic(mk_smt2_solver(m, p));
     if (sp.euf())
         return mk_sat_tactic(m, p);