Cleanup Linker / Optimizer

Same here: list the cases explicitly.