Separated fill and store expansion code