Better default value for $efprefix and minor code clean-up.
Authored by: hansfn 2015-04-06
Parent: [r4431]
Child: [r4433]
