Making things more compact.