There are also changes coming to the input select helper that may be of use. Select helper with label and values