Remove conditionals from global initializations

Also cleaned up several ifdefs that weren't needed or looked better after
rearranging, and added some comments.