Declaration normalization seems to be working now.