Add bitmask variables for soft/hard timelimit and make sure that
hard timelimit of either wall/cpu type take preference (otherwise
a program killed by either hard limit may not show as terminated).