Let's keep this alive, as I would like to finish my cleanup PR (this should only affect Neutron, so far).
I think the top 2 suggestions are (did I miss anything?): 1) Change to createBuilder / createObject 2) Leave as is (createOptions) Any examples of existing code that can help steer us one way or the other?