Update from PR Review.

Move overridable defaults to the top of the defaults file.
Remove the handlers stub.