Cleaned up the rest of block declarations.  Pending complete refactor.