Simplify types

On behalf of ECL (not that it helps).

Signed-off-by: Michael Livshin <dev@cmm.kakpryg.net>