Code tweaks
Loosen some callable constraints
Remove some implicit return voids
Code tweaks
Make some comparaisons more strict