made types consistent with those defined in Hack
made phpdoc types consistent with those defined in Hack