TypeInstance replaced with variable; removed octal literals in enums due to tests failing
interface xample fixed