Added tweaks by Gonzalo Benoffi. (Still PropType spinner doesn't work.)