Move the warning on unsupported units to the swicth-case. Move fetching the
pending tags down to where we use them.