Rename general to base
Baseline should also be set if $global-reset is true.
Finish properly annotating the reset module