File: make a diff in core code a bit smaller