Add the memory alignment option...
Simplify one of the #ifdef's