Cleaned up some block-based retain cycles.