Looks good to me. I see no functional change but less lines of code and a more consistent way to change capenable and hwassist.