Simplify init slightly.