Merge "linker: small code-cleanup"