Properly distinguish between 'proper' and 'computed' constants (closes #190).