Shaving a few more bytes