Warning killing spree; Tried converting macro to functions; Misc stuff.
+FIXME