Better uniformity with other non-basic commands.