This simplifies neutron library code and makes it less prone to breakage in the future. So far there are no specific known issues with existing code per se, it works, still. Change-Id: I28f1997d226baae902dae5ca8ee6cd4fd89efe31