Rebuilt for improved (_default)ed code-path.