Minor fine-tuning regarding form collection handling