Another optimization - unnecessary short->int casts removed.