Trivial defaultValue cleanup