Eliminated "masks earlier declaration" warnings