Reduced size of bootstrap code by ~200 bytes.