Fix some fine-grained form presentation bugs.