Cleaned up the toolbar creation assertions.