Fix #41—Use more common initialization pattern