Make the avoptions list of sws more complete.