Fix post-file-shift build breaks.