#29: Improved creation mode handling.