Rearrange to remove "Warning: has no semantics"