Minor rework to the LavObject processing logic