Refined imported. Added 'str' to the list of mcc keywords.  Consolidated
rel and loc logic.