Moving static constructors into package functions