Premature optimization is the root of all evil

Also, got rid of the wrapping structs.