While here, use $? contraction. Reported by: O. Hartmann
While there, respect MK_SOURCELESS_UCODE. Discussed with: kevlo