Added -a option to enable contiguous initial allocation; code cleanup.