diff --git a/tgt-vhdl/expr.cc b/tgt-vhdl/expr.cc
index 29f1d312c..d14e3fc99 100644
--- a/tgt-vhdl/expr.cc
+++ b/tgt-vhdl/expr.cc
@@ -55,6 +55,12 @@ static vhdl_expr *translate_number(ivl_expr_t e)
    return new vhdl_const_bits(ivl_expr_bits(e));
 }
 
+static vhdl_expr *translate_unary(ivl_expr_t e)
+{
+   std::cout << "Unary opcode " << ivl_expr_opcode(e) << std::endl;
+   return NULL;
+}
+
 /*
  * Generate a VHDL expression from a Verilog expression.
  */
@@ -69,6 +75,8 @@ vhdl_expr *translate_expr(ivl_expr_t e)
       return translate_signal(e);
    case IVL_EX_NUMBER:
       return translate_number(e);
+   case IVL_EX_UNARY:
+      return translate_unary(e);
    default:
       error("No VHDL translation for expression at %s:%d (type = %d)",
             ivl_expr_file(e), ivl_expr_lineno(e), type);
diff --git a/tgt-vhdl/stmt.cc b/tgt-vhdl/stmt.cc
index e1e09eb1e..c22d20777 100644
--- a/tgt-vhdl/stmt.cc
+++ b/tgt-vhdl/stmt.cc
@@ -242,6 +242,8 @@ static int draw_delay(vhdl_process *proc, stmt_container *container,
 static int draw_wait(vhdl_process *proc, stmt_container *container,
                      ivl_statement_t stmt)
 {
+   ivl_statement_t sub_stmt = ivl_stmt_sub_stmt(stmt);
+   
    int nevents = ivl_stmt_nevent(stmt);
    for (int i = 0; i < nevents; i++) {
       ivl_event_t event = ivl_stmt_events(stmt, i);
@@ -268,6 +270,7 @@ static int draw_wait(vhdl_process *proc, stmt_container *container,
                if (proc->get_parent()->have_declared(signame)) {
                   proc->add_sensitivity(signame);
                   non_edges.push_back(signame);
+                  break;
                }
             }
             else {
@@ -298,6 +301,7 @@ static int draw_wait(vhdl_process *proc, stmt_container *container,
                      (new vhdl_var_ref(ivl_signal_basename(sig),
                                        vhdl_type::std_logic()));
                   test->add_expr(detect);
+                  break;
                }
             }
          }
@@ -318,6 +322,7 @@ static int draw_wait(vhdl_process *proc, stmt_container *container,
                      (new vhdl_var_ref(ivl_signal_basename(sig),
                                        vhdl_type::std_logic()));
                   test->add_expr(detect);
+                  break;
                }
             }
          }
@@ -329,17 +334,18 @@ static int draw_wait(vhdl_process *proc, stmt_container *container,
                (new vhdl_var_ref((*it + "'Event").c_str(),
                                  vhdl_type::boolean()));
          }
+
+         vhdl_if_stmt *edge_det = new vhdl_if_stmt(test);
+         container->add_stmt(edge_det);
          
-         container->add_stmt(new vhdl_if_stmt(test));
+         draw_stmt(proc, edge_det->get_then_container(), sub_stmt);
       }
       else {
          // Don't bother generating an edge detector if there
          // are no edge-triggered events
+         draw_stmt(proc, container, sub_stmt);
       }
    }
-
-   ivl_statement_t sub_stmt = ivl_stmt_sub_stmt(stmt);
-   draw_stmt(proc, container, sub_stmt);
    
    return 0;
 }
diff --git a/tgt-vhdl/vhdl_syntax.cc b/tgt-vhdl/vhdl_syntax.cc
index 5800fff46..9387f5eef 100644
--- a/tgt-vhdl/vhdl_syntax.cc
+++ b/tgt-vhdl/vhdl_syntax.cc
@@ -567,10 +567,8 @@ void vhdl_if_stmt::emit(std::ofstream &of, int level) const
    of << "if ";
    test_->emit(of, level);
    of << " then";
-   newline(of, level);
    then_part_.emit(of, level);
    of << "else";
-   newline(of, level);
    else_part_.emit(of, level);
    of << "end if;";
 }