Provide old constructors again; minor clean-up