vim: Fix some folding and formatting issues