Change to use maybe package instead of pointers to small types.