Removed a dependency on Narvalo.Portable