Minor improvements for consistency and for ease of use.