Build fixes.
Removed an unreachable.