macros to be inlined. Code cleanups (excess prototype, old-style function definition). reviewed by: plam