Remove request type testing, as we cannot do it reliably through typehinting.
Restructure it a bit.