Make more subproject friendly.