Minor changes, some unnecessary defines removed.