Further tweaks to form opening/closing.