Update spacing in core/base, again