ob1 code. Create some new macros and functions to handle some differences. This commit was SVN r23913.