Cleaned up some constructor visibility.