Changed code to not depend on explicitly set pointer size.
Tweaks.