Small size improvements using constants