Upstream changes: 0.50 2017-02-07 18:59:30Z - reverted the is_Fo and to_Foo refactoring again temporarily to resolve issues with Sub::Defer