Start adding -spec and -type to all relevant methods and types.