Changed to look more like current Perl OO practices.