Made other shadow-related variables more explicit.