Web references cleanup and implement some other default types

The only changing commit is c17c003.