Index: uspace/lib/libc/generic/stacktrace.c
===================================================================
--- uspace/lib/libc/generic/stacktrace.c	(revision 08232eec7477aa13695d471714768b19b5d6d270)
+++ uspace/lib/libc/generic/stacktrace.c	(revision 5f70118b6d20d92217e8fec065754f5857117bdb)
@@ -39,6 +39,4 @@
 void stack_trace_fp_pc(uintptr_t fp, uintptr_t pc)
 {
-	printf("Printing stack trace:\n");
-	printf("=====================\n");
 	while (frame_pointer_validate(fp)) {
 		printf("%p: %p()\n", fp, pc);
@@ -46,5 +44,4 @@
 		fp = frame_pointer_prev(fp);
 	}
-	printf("=====================\n");
 }
 
Index: uspace/lib/libc/include/assert.h
===================================================================
--- uspace/lib/libc/include/assert.h	(revision 08232eec7477aa13695d471714768b19b5d6d270)
+++ uspace/lib/libc/include/assert.h	(revision 5f70118b6d20d92217e8fec065754f5857117bdb)
@@ -51,5 +51,12 @@
 
 #ifndef NDEBUG
-#	define assert(expr) if (!(expr)) { printf("Assertion failed (%s) at file '%s', line %d.\n", #expr, __FILE__, __LINE__); abort();}
+#	define assert(expr) \
+		do { \
+			if (!(expr)) { \
+				printf("Assertion failed (%s) at file '%s', " \
+				    "line %d.\n", #expr, __FILE__, __LINE__); \
+				abort(); \
+			} \
+		} while (0)
 #else
 #	define assert(expr)