More nit-picking the source layout