Finish adding support for type='clear'