Simplify init a bit.