Try to simplify the typing

Probably won't work...