Rework macros.

Remove defpixelmap macro and replace with a dopixel macro.