Cleaned up alias definitions a bit.