The release has dropped i386-linux support so we reworked the code to reflect this change, dropping some indirections. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>