Segmentation optimalization + cleanups in macros.