Allow upgrade of dimension type on conflicts.
Use consistent buffer for BPF byte-major.
Use getFieldAs instead of getField.