Finish refactoring into the bse inputs.