Minor cleanup of close builtin methods in program builder.