Well, that was embarassing.  (Remove size macro)

...I think I need sleep.  That last commit before this one shows it
quite clearly.