Continued to correct issues introduced by type aliasing.